bitkeeper revision 1.1236.1.146 (42487c63RNAgA2iD3MzC_827ws4_gA)

merge

diff --cc BitKeeper/etc/ignore
index 1d370131c1a0a77121d8ca789ec28cb79e69e986,f772e7094f016b1365be3e9570ce6b37afe2af0b..0319994826e042942211358042414c85240e3ffb
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -44,14 -42,12 +44,16 @@@ docs/user/internals.p
  docs/user/labels.pl
  docs/user/user.css
  docs/user/user.html
 -dist/*
+ extras/mini-os/h/hypervisor-ifs
 +extras/mini-os/h/xen-public
 +extras/mini-os/mini-os.*
 +install/*
  linux-*-xen0/*
  linux-*-xenU/*
 -linux-xen-sparse
  linux-*.patch
++linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh
 +linux-xen-sparse
 +mkddbxen
  netbsd-*-tools/*
  netbsd-*-xen0/*
  netbsd-*-xenU/*
@@@ -61,68 -55,42 +63,70 @@@ patches/ebtables.dif
  patches/tmp/*
  pristine-*
  tools/*/build/lib*/*.py
++tools/Makefile.smh
  tools/balloon/balloon
++tools/blktap/Makefile.smh
++tools/blktap/blkcow
++tools/blktap/blkcowgnbd
++tools/blktap/blkcowimg
++tools/blktap/blkdump
++tools/blktap/blkgnbd
++tools/blktap/blkimg
++tools/blktap/blockstore.dat
++tools/blktap/blockstored
++tools/blktap/bstest
++tools/blktap/parallax
++tools/blktap/vdi.dot
++tools/blktap/vdi.ps
++tools/blktap/vdi_create
++tools/blktap/vdi_fill
++tools/blktap/vdi_list
++tools/blktap/vdi_snap
++tools/blktap/vdi_snap_list
++tools/blktap/vdi_tree
++tools/blktap/vdi_validate
++tools/blktap/xen/*
  tools/check/.*
++tools/cmdline/*
 +tools/cmdline/xen/*
 +tools/ioemu/iodev/device-model
  tools/libxc/xen/*
  tools/misc/miniterm/miniterm
 +tools/misc/xen_cpuperf
  tools/misc/xenperf
++tools/tests/test_x86_emulator
  tools/vnet/gc
  tools/vnet/gc*/*
 -tools/vnet/vnet-module/.tmp_versions/*
 -tools/vnet/vnet-module/.*.cmd
  tools/vnet/vnet-module/*.ko
 +tools/vnet/vnet-module/.*.cmd
 +tools/vnet/vnet-module/.tmp_versions/*
  tools/vnet/vnet-module/vnet_module.mod.*
  tools/vnetd/vnetd
  tools/web-shutdown.tap
 +tools/x2d2/minixend
 +tools/xcs/xcs
 +tools/xcs/xcsdump
  tools/xentrace/xentrace
  tools/xfrd/xfrd
 -xen/tags
 +xen/BLOG
+ xen/TAGS
  xen/arch/x86/asm-offsets.s
  xen/arch/x86/boot/mkelf32
 +xen/ddb/*
  xen/drivers/pci/classlist.h
  xen/drivers/pci/devlist.h
  xen/drivers/pci/gen-devlist
  xen/figlet/figlet
  xen/include/asm
  xen/include/asm-*/asm-offsets.h
+ xen/include/hypervisor-ifs/arch
 +xen/include/public/public
  xen/include/xen/*.new
  xen/include/xen/banner.h
  xen/include/xen/compile.h
++xen/tags
  xen/tools/elf-reloc
  xen/tools/figlet/figlet
  xen/xen
  xen/xen-syms
  xen/xen.*
- linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh
- tools/Makefile.smh
- tools/blktap/Makefile.smh
- tools/blktap/blkcow
- tools/blktap/blkcowgnbd
- tools/blktap/blkcowimg
- tools/blktap/blkdump
- tools/blktap/blkgnbd
- tools/blktap/blkimg
- tools/blktap/blockstore.dat
- tools/blktap/parallax
- tools/blktap/vdi.dot
- tools/blktap/vdi.ps
- tools/blktap/vdi_create
- tools/blktap/vdi_fill
- tools/blktap/vdi_list
- tools/blktap/vdi_snap
- tools/blktap/vdi_snap_list
- tools/blktap/vdi_tree
- tools/blktap/vdi_validate
- tools/blktap/xen/*
- tools/cmdline/*
- tools/tests/test_x86_emulator
- tools/blktap/blockstored
- tools/blktap/bstest
 -install/*
 -patches/ebtables-brnf-5_vs_2.4.25.diff
 -patches/ebtables.diff
 -tools/x2d2/minixend
 -BLOG

diff --cc xen/Makefile
index 561a85139bfaef1537185c182893dd3de38aed99,b36ed9a43e08460d61328424a4c2d3706c911154..57a150d18a6366e5cb7cf57872e3198be261c014
--- 1/xen/Makefile
--- 2/xen/Makefile
+++ b/xen/Makefile
@@@ -110,6 -110,11 +110,11 @@@ TAGS
        ( find include/asm-$(TARGET_ARCH) -name '*.h'; \
          find include -type d \( -name "asm-*" -o -name config \) -prune -o \
                -name '*.h' -print; \
 -        find $(SUBDIRS) -name '*.[ch]' ) | grep -v /SCCS/ | etags -
 +        find $(SUBDIRS) -name '*.[chS]' ) | grep -v /SCCS/ | etags -
+ tags: 
+       ( find include/asm-$(TARGET_ARCH) -name '*.h'; \
+         find include -type d \( -name "asm-*" -o -name config \) -prune -o \
+               -name '*.h' -print; \
+         find $(SUBDIRS) -name '*.[chS]' ) | grep -v /SCCS/ | xargs ctags
  MAP:
        nm $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map